From a96b473563b8c4f73d817ee9ae507ad7da07422a Mon Sep 17 00:00:00 2001 From: Andrew Choi Date: Sun, 25 Aug 2002 17:15:26 +0000 Subject: [PATCH] 2002-08-25 Andrew Choi * emacs.c (main): Call init_mac_osx_environment if HAVE_CARBON is defined instead of MAC_OSX. * s/darwin.h (select): Define select to sys_select only if HAVE_CARBON is defined. --- src/ChangeLog | 8 ++++++-- src/emacs.c | 2 +- src/s/darwin.h | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index df59a27aef1..a6e41b4bc75 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,11 @@ 2002-08-25 Andrew Choi - * s/darwin.h (HAVE_WORKING_VFORK): #undef it. Define vfork to - fork. + * emacs.c (main): Call init_mac_osx_environment if HAVE_CARBON is + defined instead of MAC_OSX. + + * s/darwin.h (select): Define select to sys_select only if + HAVE_CARBON is defined. + (HAVE_WORKING_VFORK): #undef it. Define vfork to fork. * macterm.c (XTread_socket): Remove code to call SendEventToEventTarget for keys with command modifiers when diff --git a/src/emacs.c b/src/emacs.c index 63a94306e4e..cf48bf28da4 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -794,7 +794,7 @@ main (argc, argv, envp) run_time_remap (argv[0]); #endif -#ifdef MAC_OSX +#ifdef HAVE_CARBON if (!initialized) unexec_init_emacs_zone (); #endif diff --git a/src/s/darwin.h b/src/s/darwin.h index dcfb00a568e..6fd4b94dde0 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h @@ -312,6 +312,6 @@ struct kboard; /* Reroute calls to SELECT to the version defined in mac.c to fix the problem of Emacs requiring an extra return to be typed to start working when started from the command line. */ -#if defined (emacs) || defined (temacs) +#if defined (HAVE_CARBON) && (defined (emacs) || defined (temacs)) #define select sys_select #endif -- 2.30.2